Really fix the x86/64 build. Get rid of push/pop from

scale_delta().
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
index 9925dc98433d0d09eb081ce3281a38862a0daacc..6a0fde813c5ee711b67c0c1768e81cbf5b05e8dc 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
@@ -173,7 +173,7 @@ struct timer_opts timer_tsc = {
 static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift)
 {
        u64 product;
-       u32 tmp;
+       u32 tmp1, tmp2;
 
        if ( shift < 0 )
                delta >>= -shift;
@@ -181,17 +181,15 @@ static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift)
                delta <<= shift;
 
        __asm__ (
-               "push %%edx    ; "
-               "mul  %3       ; "
-               "pop  %%eax    ; "
-               "push %%edx    ; "
-               "mul  %3       ; "
-               "pop  %3       ; "
-               "add  %3,%%eax ; "
-               "xor  %3,%3    ; "
-               "adc  %3,%%edx ; "
-               : "=A" (product), "=r" (tmp)
-               : "A" (delta), "1" (mul_frac) );
+               "mul  %5       ; "
+               "mov  %4,%%eax ; "
+               "mov  %%edx,%4 ; "
+               "mul  %5       ; "
+               "add  %4,%%eax ; "
+               "xor  %5,%5    ; "
+               "adc  %5,%%edx ; "
+               : "=A" (product), "=r" (tmp1), "=r" (tmp2)
+               : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
 
        return product;
 }

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 0d13382aba7f305c5c29639fcb717a6a969c3a36..ade1f2f75854e0ce69c4155384609ea4cd9810fc 100644 (file)
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -103,7 +103,7 @@ static inline u32 mul_frac(u32 multiplicand, u32 multiplier)
 static inline u64 scale_delta(u64 delta, struct time_scale *scale)
 {
     u64 product;
-    u32 tmp;
+    u32 tmp1, tmp2;
 
     if ( scale->shift < 0 )
         delta >>= -scale->shift;
@@ -111,17 +111,15 @@ static inline u64 scale_delta(u64 delta, struct time_scale *scale)
         delta <<= scale->shift;
 
     __asm__ (
-        "push %%edx    ; "
-        "mul  %3       ; "
-        "pop  %%eax    ; "
-        "push %%edx    ; "
-        "mul  %3       ; "
-        "pop  %3       ; "
-        "add  %3,%%eax ; "
-        "xor  %3,%3    ; "
-        "adc  %3,%%edx ; "
-        : "=A" (product), "=r" (tmp)
-        : "A" (delta), "1" (scale->mul_frac) );
+        "mul  %5       ; "
+        "mov  %4,%%eax ; "
+        "mov  %%edx,%4 ; "
+        "mul  %5       ; "
+        "add  %4,%%eax ; "
+        "xor  %5,%5    ; "
+        "adc  %5,%%edx ; "
+        : "=A" (product), "=r" (tmp1), "=r" (tmp2)
+        : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (scale->mul_frac) );
 
     return product;
 }